Merge from emacs-24; up to r111350
authorGlenn Morris <rgm@gnu.org>
Thu, 9 May 2013 02:44:12 +0000 (19:44 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 9 May 2013 02:44:12 +0000 (19:44 -0700)
commite03dc4ee9d293fab335757f10a1a8a40a21112d5
treecd0dd416762a9ffec2d33290130a3ada8512802a
parent07160404eeca90c247f41c77d61f666358dda6a7
parentaeb09d02496a5e0b993cdf8eed379a85f972ef33
Merge from emacs-24; up to r111350
doc/emacs/ChangeLog
doc/emacs/trouble.texi
lisp/ChangeLog
lisp/descr-text.el